Fix to allow -xen and -xen0 kernels to be used as unprivilged guests.

Signed-off-by: ian@xensource.com

diff --git a/linux-2.6-xen-sparse/arch/xen/i386/kernel/setup.c b/linux-2.6-xen-sparse/arch/xen/i386/kernel/setup.c
index bfa0181e617a114235e4c1cbc1923c115caa5627..bd1babe7425bb85705bb1e5fe90c08a40fec86ab 100644 (file)
--- a/linux-2.6-xen-sparse/arch/xen/i386/kernel/setup.c
+++ b/linux-2.6-xen-sparse/arch/xen/i386/kernel/setup.c
@@ -1633,8 +1633,8 @@ void __init setup_arch(char **cmdline_p)
        }
 #endif
 
-
-       dmi_scan_machine();
+       if (xen_start_info.flags & SIF_INITDOMAIN)
+               dmi_scan_machine();
 
 #ifdef CONFIG_X86_GENERICARCH
        generic_apic_probe(*cmdline_p);